From: Matthias Clasen Date: Sat, 7 Jan 2023 17:01:15 +0000 (-0500) Subject: filesystemmodel: Rename private header X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~116^2^2~85^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ad940bc8927d8ff54d9c59fda523d4b3f2aad17b;p=gtk4.git filesystemmodel: Rename private header --- diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index 7f3215ff3e..c53784bcf9 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -20,7 +20,7 @@ #define __GTK_FILE_CHOOSER_PRIVATE_H__ #include "deprecated/gtkfilechooser.h" -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" #include "deprecated/gtkliststore.h" #include "gtkrecentmanager.h" #include "gtksearchengineprivate.h" diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 5152e090de..9415dc3ba5 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -36,7 +36,7 @@ #include "deprecated/gtkfilechooser.h" #include "gtkfilechooserentry.h" #include "gtkfilechooserutils.h" -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" #include "gtkfilethumbnail.h" #include "gtkgestureclick.h" #include "gtkgesturelongpress.h" diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 5005a4c5bf..c5b9108805 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -18,7 +18,7 @@ #include "config.h" -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" #include #include diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h deleted file mode 100644 index 32875eba6b..0000000000 --- a/gtk/gtkfilesystemmodel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* GTK - The GIMP Toolkit - * gtkfilesystemmodel.h: GtkTreeModel wrapping a GtkFileSystem - * Copyright (C) 2003, Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GTK_FILE_SYSTEM_MODEL_H__ -#define __GTK_FILE_SYSTEM_MODEL_H__ - -#include -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_FILE_SYSTEM_MODEL (gtk_file_system_model_get_type ()) -G_DECLARE_FINAL_TYPE (GtkFileSystemModel, gtk_file_system_model, GTK, FILE_SYSTEM_MODEL, GObject) - -GtkFileSystemModel *_gtk_file_system_model_new (void); -GtkFileSystemModel *_gtk_file_system_model_new_for_directory(GFile *dir, - const char *attributes); -GFile * _gtk_file_system_model_get_directory (GtkFileSystemModel *model); -GCancellable * _gtk_file_system_model_get_cancellable (GtkFileSystemModel *model); -GFileInfo * _gtk_file_system_model_get_info_for_file(GtkFileSystemModel *model, - GFile *file); - -void _gtk_file_system_model_add_and_query_file (GtkFileSystemModel *model, - GFile *file, - const char *attributes); -void _gtk_file_system_model_add_and_query_files (GtkFileSystemModel *model, - GList *files, - const char *attributes); -void _gtk_file_system_model_update_files (GtkFileSystemModel *model, - GList *files, - GList *infos); - -void _gtk_file_system_model_set_show_hidden (GtkFileSystemModel *model, - gboolean show_hidden); -void _gtk_file_system_model_set_show_folders (GtkFileSystemModel *model, - gboolean show_folders); -void _gtk_file_system_model_set_show_files (GtkFileSystemModel *model, - gboolean show_files); -void _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model, - gboolean show_folders); - -void _gtk_file_system_model_set_filter (GtkFileSystemModel *model, - GtkFileFilter *filter); - -G_END_DECLS - -#endif /* __GTK_FILE_SYSTEM_MODEL_H__ */ diff --git a/gtk/gtkfilesystemmodelprivate.h b/gtk/gtkfilesystemmodelprivate.h new file mode 100644 index 0000000000..36bf750e86 --- /dev/null +++ b/gtk/gtkfilesystemmodelprivate.h @@ -0,0 +1,62 @@ +/* GTK - The GIMP Toolkit + * gtkfilesystemmodelprivate.h: GtkTreeModel wrapping a GtkFileSystem + * Copyright (C) 2003, Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#ifndef __GTK_FILE_SYSTEM_MODEL_PRIVATE_H__ +#define __GTK_FILE_SYSTEM_MODEL_PRIVATE_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GTK_TYPE_FILE_SYSTEM_MODEL (gtk_file_system_model_get_type ()) +G_DECLARE_FINAL_TYPE (GtkFileSystemModel, gtk_file_system_model, GTK, FILE_SYSTEM_MODEL, GObject) + +GtkFileSystemModel *_gtk_file_system_model_new (void); +GtkFileSystemModel *_gtk_file_system_model_new_for_directory(GFile *dir, + const char *attributes); +GFile * _gtk_file_system_model_get_directory (GtkFileSystemModel *model); +GCancellable * _gtk_file_system_model_get_cancellable (GtkFileSystemModel *model); +GFileInfo * _gtk_file_system_model_get_info_for_file(GtkFileSystemModel *model, + GFile *file); + +void _gtk_file_system_model_add_and_query_file (GtkFileSystemModel *model, + GFile *file, + const char *attributes); +void _gtk_file_system_model_add_and_query_files (GtkFileSystemModel *model, + GList *files, + const char *attributes); +void _gtk_file_system_model_update_files (GtkFileSystemModel *model, + GList *files, + GList *infos); + +void _gtk_file_system_model_set_show_hidden (GtkFileSystemModel *model, + gboolean show_hidden); +void _gtk_file_system_model_set_show_folders (GtkFileSystemModel *model, + gboolean show_folders); +void _gtk_file_system_model_set_show_files (GtkFileSystemModel *model, + gboolean show_files); +void _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model, + gboolean show_folders); + +void _gtk_file_system_model_set_filter (GtkFileSystemModel *model, + GtkFileFilter *filter); + +G_END_DECLS + +#endif /* __GTK_FILE_SYSTEM_MODEL_PRIVATE_H__ */ diff --git a/gtk/gtkfilethumbnail.h b/gtk/gtkfilethumbnail.h index bdb3f6c46f..ad6b7eebfa 100644 --- a/gtk/gtkfilethumbnail.h +++ b/gtk/gtkfilethumbnail.h @@ -24,7 +24,7 @@ #include -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtksearchenginemodelprivate.h b/gtk/gtksearchenginemodelprivate.h index f0b9dcf471..4799dd508b 100644 --- a/gtk/gtksearchenginemodelprivate.h +++ b/gtk/gtksearchenginemodelprivate.h @@ -21,7 +21,7 @@ #define __GTK_SEARCH_ENGINE_MODEL_H__ #include "gtksearchengineprivate.h" -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtksearchengineprivate.h b/gtk/gtksearchengineprivate.h index e23e197c34..f0d3da49b0 100644 --- a/gtk/gtksearchengineprivate.h +++ b/gtk/gtksearchengineprivate.h @@ -23,7 +23,7 @@ #define __GTK_SEARCH_ENGINE_H__ #include "gtkquery.h" -#include "gtkfilesystemmodel.h" +#include "gtkfilesystemmodelprivate.h" #include G_BEGIN_DECLS